Regenerate libostree-sys

diff --git a/rust-bindings/rust/libostree-sys/src/lib.rs b/rust-bindings/rust/libostree-sys/src/lib.rs
index a6573d1e655fafa7380cffe816ac6bb67e2e6b92..61384a3fd299523494aa005b80459384bc15a2b5 100644 (file)
--- a/rust-bindings/rust/libostree-sys/src/lib.rs
+++ b/rust-bindings/rust/libostree-sys/src/lib.rs
@@ -247,28 +247,6 @@ impl ::std::fmt::Debug for OstreeBootloaderGrub2 {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeBootloaderInterface {
-    pub g_iface: gobject::GTypeInterface,
-    pub query: Option<unsafe extern "C" fn(*mut OstreeBootloader, *mut gboolean, *mut gio::GCancellable, *mut *mut glib::GError) -> gboolean>,
-    pub get_name: Option<unsafe extern "C" fn(*mut OstreeBootloader) -> *const c_char>,
-    pub write_config: Option<unsafe extern "C" fn(*mut OstreeBootloader, c_int, *mut gio::GCancellable, *mut *mut glib::GError) -> gboolean>,
-    pub is_atomic: Option<unsafe extern "C" fn(*mut OstreeBootloader) -> gboolean>,
-}
-
-impl ::std::fmt::Debug for OstreeBootloaderInterface {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeBootloaderInterface @ {:?}", self as *const _))
-         .field("g_iface", &self.g_iface)
-         .field("query", &self.query)
-         .field("get_name", &self.get_name)
-         .field("write_config", &self.write_config)
-         .field("is_atomic", &self.is_atomic)
-         .finish()
-    }
-}
-
 #[repr(C)]
 pub struct OstreeBootloaderSyslinux(c_void);
 
@@ -289,30 +267,6 @@ impl ::std::fmt::Debug for OstreeBootloaderUboot {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeChecksumInputStreamClass {
-    pub parent_class: gio::GFilterInputStreamClass,
-    pub _g_reserved1: Option<unsafe extern "C" fn()>,
-    pub _g_reserved2: Option<unsafe extern "C" fn()>,
-    pub _g_reserved3: Option<unsafe extern "C" fn()>,
-    pub _g_reserved4: Option<unsafe extern "C" fn()>,
-    pub _g_reserved5: Option<unsafe extern "C" fn()>,
-}
-
-impl ::std::fmt::Debug for OstreeChecksumInputStreamClass {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeChecksumInputStreamClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .field("_g_reserved1", &self._g_reserved1)
-         .field("_g_reserved2", &self._g_reserved2)
-         .field("_g_reserved3", &self._g_reserved3)
-         .field("_g_reserved4", &self._g_reserved4)
-         .field("_g_reserved5", &self._g_reserved5)
-         .finish()
-    }
-}
-
 #[repr(C)]
 pub struct OstreeChecksumInputStreamPrivate(c_void);
 
@@ -323,32 +277,6 @@ impl ::std::fmt::Debug for OstreeChecksumInputStreamPrivate {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeCmdPrivateVTable {
-    pub ostree_system_generator: Option<unsafe extern "C" fn(*const c_char, *const c_char, *const c_char, *const c_char, *mut *mut glib::GError) -> gboolean>,
-    pub ostree_generate_grub2_config: Option<unsafe extern "C" fn(*mut OstreeSysroot, c_int, c_int, *mut gio::GCancellable, *mut *mut glib::GError) -> gboolean>,
-    pub ostree_static_delta_dump: Option<unsafe extern "C" fn(*mut OstreeRepo, *const c_char, *mut gio::GCancellable, *mut *mut glib::GError) -> gboolean>,
-    pub ostree_static_delta_query_exists: Option<unsafe extern "C" fn(*mut OstreeRepo, *const c_char, *mut gboolean, *mut gio::GCancellable, *mut *mut glib::GError) -> gboolean>,
-    pub ostree_static_delta_delete: Option<unsafe extern "C" fn(*mut OstreeRepo, *const c_char, *mut gio::GCancellable, *mut *mut glib::GError) -> gboolean>,
-    pub ostree_repo_verify_bindings: Option<unsafe extern "C" fn(*const c_char, *const c_char, *mut glib::GVariant, *mut *mut glib::GError) -> gboolean>,
-    pub ostree_finalize_staged: Option<unsafe extern "C" fn(*mut OstreeSysroot, *mut gio::GCancellable, *mut *mut glib::GError) -> gboolean>,
-}
-
-impl ::std::fmt::Debug for OstreeCmdPrivateVTable {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeCmdPrivateVTable @ {:?}", self as *const _))
-         .field("ostree_system_generator", &self.ostree_system_generator)
-         .field("ostree_generate_grub2_config", &self.ostree_generate_grub2_config)
-         .field("ostree_static_delta_dump", &self.ostree_static_delta_dump)
-         .field("ostree_static_delta_query_exists", &self.ostree_static_delta_query_exists)
-         .field("ostree_static_delta_delete", &self.ostree_static_delta_delete)
-         .field("ostree_repo_verify_bindings", &self.ostree_repo_verify_bindings)
-         .field("ostree_finalize_staged", &self.ostree_finalize_staged)
-         .finish()
-    }
-}
-
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct OstreeCollectionRef {
@@ -424,45 +352,6 @@ impl ::std::fmt::Debug for OstreeGpgVerifier {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeLibarchiveInputStream {
-    pub parent_instance: gio::GInputStream,
-    pub priv_: *mut OstreeLibarchiveInputStreamPrivate,
-}
-
-impl ::std::fmt::Debug for OstreeLibarchiveInputStream {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeLibarchiveInputStream @ {:?}", self as *const _))
-         .field("parent_instance", &self.parent_instance)
-         .finish()
-    }
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeLibarchiveInputStreamClass {
-    pub parent_class: gio::GInputStreamClass,
-    pub _g_reserved1: Option<unsafe extern "C" fn()>,
-    pub _g_reserved2: Option<unsafe extern "C" fn()>,
-    pub _g_reserved3: Option<unsafe extern "C" fn()>,
-    pub _g_reserved4: Option<unsafe extern "C" fn()>,
-    pub _g_reserved5: Option<unsafe extern "C" fn()>,
-}
-
-impl ::std::fmt::Debug for OstreeLibarchiveInputStreamClass {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeLibarchiveInputStreamClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .field("_g_reserved1", &self._g_reserved1)
-         .field("_g_reserved2", &self._g_reserved2)
-         .field("_g_reserved3", &self._g_reserved3)
-         .field("_g_reserved4", &self._g_reserved4)
-         .field("_g_reserved5", &self._g_reserved5)
-         .finish()
-    }
-}
-
 #[repr(C)]
 pub struct OstreeLibarchiveInputStreamPrivate(c_void);
 
@@ -483,20 +372,6 @@ impl ::std::fmt::Debug for OstreeLzmaCompressor {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeLzmaCompressorClass {
-    pub parent_class: gobject::GObjectClass,
-}
-
-impl ::std::fmt::Debug for OstreeLzmaCompressorClass {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeLzmaCompressorClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
-    }
-}
-
 #[repr(C)]
 pub struct OstreeLzmaDecompressor(c_void);
 
@@ -507,20 +382,6 @@ impl ::std::fmt::Debug for OstreeLzmaDecompressor {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeLzmaDecompressorClass {
-    pub parent_class: gobject::GObjectClass,
-}
-
-impl ::std::fmt::Debug for OstreeLzmaDecompressorClass {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeLzmaDecompressorClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
-    }
-}
-
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct OstreeMutableTreeClass {
@@ -698,20 +559,6 @@ impl ::std::fmt::Debug for OstreeRepoFileEnumerator {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeRepoFileEnumeratorClass {
-    pub parent_class: gio::GFileEnumeratorClass,
-}
-
-impl ::std::fmt::Debug for OstreeRepoFileEnumeratorClass {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFileEnumeratorClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
-    }
-}
-
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct OstreeRepoFinderAvahiClass {
@@ -876,32 +723,6 @@ impl ::std::fmt::Debug for OstreeRepoTransactionStats {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeRollsumMatches {
-    pub from_rollsums: *mut glib::GHashTable,
-    pub to_rollsums: *mut glib::GHashTable,
-    pub crcmatches: c_uint,
-    pub bufmatches: c_uint,
-    pub total: c_uint,
-    pub match_size: u64,
-    pub matches: *mut glib::GPtrArray,
-}
-
-impl ::std::fmt::Debug for OstreeRollsumMatches {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRollsumMatches @ {:?}", self as *const _))
-         .field("from_rollsums", &self.from_rollsums)
-         .field("to_rollsums", &self.to_rollsums)
-         .field("crcmatches", &self.crcmatches)
-         .field("bufmatches", &self.bufmatches)
-         .field("total", &self.total)
-         .field("match_size", &self.match_size)
-         .field("matches", &self.matches)
-         .finish()
-    }
-}
-
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct OstreeSysrootWriteDeploymentsOpts {
@@ -963,21 +784,6 @@ impl ::std::fmt::Debug for OstreeBootconfigParser {
     }
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeChecksumInputStream {
-    pub parent_instance: gio::GFilterInputStream,
-    pub priv_: *mut OstreeChecksumInputStreamPrivate,
-}
-
-impl ::std::fmt::Debug for OstreeChecksumInputStream {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeChecksumInputStream @ {:?}", self as *const _))
-         .field("parent_instance", &self.parent_instance)
-         .finish()
-    }
-}
-
 #[repr(C)]
 pub struct OstreeDeployment(c_void);
 
@@ -1252,7 +1058,7 @@ extern "C" {
     // OstreeChecksumInputStream
     //=========================================================================
     pub fn ostree_checksum_input_stream_get_type() -> GType;
-    pub fn ostree_checksum_input_stream_new(stream: *mut gio::GInputStream, checksum: *mut glib::GChecksum) -> *mut OstreeChecksumInputStream;
+    //pub fn ostree_checksum_input_stream_new(stream: *mut gio::GInputStream, checksum: *mut glib::GChecksum) -> /*Ignored*/*mut OstreeChecksumInputStream;
 
     //=========================================================================
     // OstreeDeployment
@@ -1635,7 +1441,7 @@ extern "C" {
     pub fn ostree_checksum_inplace_to_bytes(checksum: *const c_char, buf: *mut u8);
     pub fn ostree_checksum_to_bytes(checksum: *const c_char) -> *mut [u8; 32];
     pub fn ostree_checksum_to_bytes_v(checksum: *const c_char) -> *mut glib::GVariant;
-    pub fn ostree_cmd__private__() -> *const OstreeCmdPrivateVTable;
+    //pub fn ostree_cmd__private__() -> /*Ignored*/*const OstreeCmdPrivateVTable;
     pub fn ostree_cmp_checksum_bytes(a: *const u8, b: *const u8) -> c_int;
     pub fn ostree_commit_get_content_checksum(commit_variant: *mut glib::GVariant) -> *mut c_char;
     pub fn ostree_commit_get_parent(commit_variant: *mut glib::GVariant) -> *mut c_char;

diff --git a/rust-bindings/rust/libostree-sys/tests/abi.rs b/rust-bindings/rust/libostree-sys/tests/abi.rs
index 3246c22f4249f32f9bd3378944f105d4850cab5f..a5751a463f729719575c862e4cf1017b4ab7faec 100644 (file)
--- a/rust-bindings/rust/libostree-sys/tests/abi.rs
+++ b/rust-bindings/rust/libostree-sys/tests/abi.rs
@@ -232,11 +232,7 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
     ("OstreeAsyncProgressClass", Layout {size: size_of::<OstreeAsyncProgressClass>(), alignment: align_of::<OstreeAsyncProgressClass>()}),
-    ("OstreeBootloaderInterface", Layout {size: size_of::<OstreeBootloaderInterface>(), alignment: align_of::<OstreeBootloaderInterface>()}),
     ("OstreeChecksumFlags", Layout {size: size_of::<OstreeChecksumFlags>(), alignment: align_of::<OstreeChecksumFlags>()}),
-    ("OstreeChecksumInputStream", Layout {size: size_of::<OstreeChecksumInputStream>(), alignment: align_of::<OstreeChecksumInputStream>()}),
-    ("OstreeChecksumInputStreamClass", Layout {size: size_of::<OstreeChecksumInputStreamClass>(), alignment: align_of::<OstreeChecksumInputStreamClass>()}),
-    ("OstreeCmdPrivateVTable", Layout {size: size_of::<OstreeCmdPrivateVTable>(), alignment: align_of::<OstreeCmdPrivateVTable>()}),
     ("OstreeCollectionRef", Layout {size: size_of::<OstreeCollectionRef>(), alignment: align_of::<OstreeCollectionRef>()}),
     ("OstreeCollectionRefv", Layout {size: size_of::<OstreeCollectionRefv>(), alignment: align_of::<OstreeCollectionRefv>()}),
     ("OstreeDeploymentUnlockedState", Layout {size: size_of::<OstreeDeploymentUnlockedState>(), alignment: align_of::<OstreeDeploymentUnlockedState>()}),
@@ -246,10 +242,6 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
     ("OstreeGpgError", Layout {size: size_of::<OstreeGpgError>(), alignment: align_of::<OstreeGpgError>()}),
     ("OstreeGpgSignatureAttr", Layout {size: size_of::<OstreeGpgSignatureAttr>(), alignment: align_of::<OstreeGpgSignatureAttr>()}),
     ("OstreeGpgSignatureFormatFlags", Layout {size: size_of::<OstreeGpgSignatureFormatFlags>(), alignment: align_of::<OstreeGpgSignatureFormatFlags>()}),
-    ("OstreeLibarchiveInputStream", Layout {size: size_of::<OstreeLibarchiveInputStream>(), alignment: align_of::<OstreeLibarchiveInputStream>()}),
-    ("OstreeLibarchiveInputStreamClass", Layout {size: size_of::<OstreeLibarchiveInputStreamClass>(), alignment: align_of::<OstreeLibarchiveInputStreamClass>()}),
-    ("OstreeLzmaCompressorClass", Layout {size: size_of::<OstreeLzmaCompressorClass>(), alignment: align_of::<OstreeLzmaCompressorClass>()}),
-    ("OstreeLzmaDecompressorClass", Layout {size: size_of::<OstreeLzmaDecompressorClass>(), alignment: align_of::<OstreeLzmaDecompressorClass>()}),
     ("OstreeMutableTreeClass", Layout {size: size_of::<OstreeMutableTreeClass>(), alignment: align_of::<OstreeMutableTreeClass>()}),
     ("OstreeMutableTreeIter", Layout {size: size_of::<OstreeMutableTreeIter>(), alignment: align_of::<OstreeMutableTreeIter>()}),
     ("OstreeObjectType", Layout {size: size_of::<OstreeObjectType>(), alignment: align_of::<OstreeObjectType>()}),
@@ -264,7 +256,6 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
     ("OstreeRepoCommitTraverseFlags", Layout {size: size_of::<OstreeRepoCommitTraverseFlags>(), alignment: align_of::<OstreeRepoCommitTraverseFlags>()}),
     ("OstreeRepoCommitTraverseIter", Layout {size: size_of::<OstreeRepoCommitTraverseIter>(), alignment: align_of::<OstreeRepoCommitTraverseIter>()}),
     ("OstreeRepoFileClass", Layout {size: size_of::<OstreeRepoFileClass>(), alignment: align_of::<OstreeRepoFileClass>()}),
-    ("OstreeRepoFileEnumeratorClass", Layout {size: size_of::<OstreeRepoFileEnumeratorClass>(), alignment: align_of::<OstreeRepoFileEnumeratorClass>()}),
     ("OstreeRepoFinderAvahiClass", Layout {size: size_of::<OstreeRepoFinderAvahiClass>(), alignment: align_of::<OstreeRepoFinderAvahiClass>()}),
     ("OstreeRepoFinderConfigClass", Layout {size: size_of::<OstreeRepoFinderConfigClass>(), alignment: align_of::<OstreeRepoFinderConfigClass>()}),
     ("OstreeRepoFinderInterface", Layout {size: size_of::<OstreeRepoFinderInterface>(), alignment: align_of::<OstreeRepoFinderInterface>()}),
@@ -281,7 +272,6 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
     ("OstreeRepoRemoteChange", Layout {size: size_of::<OstreeRepoRemoteChange>(), alignment: align_of::<OstreeRepoRemoteChange>()}),
     ("OstreeRepoResolveRevExtFlags", Layout {size: size_of::<OstreeRepoResolveRevExtFlags>(), alignment: align_of::<OstreeRepoResolveRevExtFlags>()}),
     ("OstreeRepoTransactionStats", Layout {size: size_of::<OstreeRepoTransactionStats>(), alignment: align_of::<OstreeRepoTransactionStats>()}),
-    ("OstreeRollsumMatches", Layout {size: size_of::<OstreeRollsumMatches>(), alignment: align_of::<OstreeRollsumMatches>()}),
     ("OstreeSePolicyRestoreconFlags", Layout {size: size_of::<OstreeSePolicyRestoreconFlags>(), alignment: align_of::<OstreeSePolicyRestoreconFlags>()}),
     ("OstreeStaticDeltaGenerateOpt", Layout {size: size_of::<OstreeStaticDeltaGenerateOpt>(), alignment: align_of::<OstreeStaticDeltaGenerateOpt>()}),
     ("OstreeSysrootSimpleWriteDeploymentFlags", Layout {size: size_of::<OstreeSysrootSimpleWriteDeploymentFlags>(), alignment: align_of::<OstreeSysrootSimpleWriteDeploymentFlags>()}),